Revision: tla--small-fixes--1.1--patch-69
Archive: lord@emf.net--2003b
Creator: Tom Lord <lord@emf.net>
Date: Sun Sep 21 16:56:36 PDT 2003
Standard-date: 2003-09-21 23:56:36 GMT
Modified-files: ChangeLog PLUGIN/options
    libarch/apply-changeset.c libarch/apply-changeset.h
    libarch/build-revision.c libarch/cmd-deltapatch.c
    libarch/cmd-do-changeset.c libarch/cmd-redo-changes.c
    libarch/cmd-replay.c libarch/cmd-star-merge.c
    libarch/cmd-undo-changes.c libarch/cmd-update.c
    libarch/commit.c libarch/library-txn.c libarch/replay.c
    libarch/replay.h libarch/star-merge.c
    libarch/star-merge.h libarch/undo.c libarch/undo.h
New-patches: lord@emf.net--2003b/tla--devo--1.1--patch-170
    lord@emf.net--2003b/tla--devo--1.1--patch-171
    lord@emf.net--2003b/tla--devo--1.1--patch-172
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-69
Summary: [devo] back merge

[devo] back merge

Patches applied:

 * lord@emf.net--2003b/tla--devo--1.1--patch-170
   [small-fixes] fix off-by-one error in file-diffs (Walters)

 * lord@emf.net--2003b/tla--devo--1.1--patch-171
   3-way merge with conflict markers (in star-merge)

 * lord@emf.net--2003b/tla--devo--1.1--patch-172
   add --forward to various merging commands

